Merge pull request #9554 from alt-romes/wip/romes/7339