BHV-17002 (2.5.2-pre.8)

Merging changes from https://github.com/enyojs/moonstone/pull/1754 into `release-2.5.2-pre.8`, creating PR for tracking purposes.