Merge pull request #10771 from alt-romes/wip/romes/10686