Merge pull request #9805 from alt-romes/wip/romes/9799-2