Merge pull request #9276 from ronald-cron-arm/tree-cleanliness-3.6

[Backport 3.6] Partial backport of #9247