Merge pull request #9525 from mpg/dev-mergeback

Development-restricted mergeback