ENYO-577 (2.5)

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