ENYO-700 (2.5)

Cherry-picking changes from https://github.com/enyojs/moonstone/pull/1876 into `2.5-upkeep`, creating a PR for tracking purposes.