[WIP]: Dupe of PR #6730 but this time into the PR by aschempp.