Mark-Simulacrum Merge pull request #173 from kennytm/issue-46449-future …