BHV-18888 (2.5)

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