ENYO-591 (2.5)

Merging https://github.com/enyojs/moonstone/pull/1820 into `2.5-upkeep`, opening a PR for tracking purposes.