BHV-18764 (2.5)

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