BHV-18452 (2.5)

Cherry-picking https://github.com/enyojs/moonstone/pull/1802 to `2.5-upkeep`, opening a PR for tracking purposes.