Merge pull request #11607 from jordojordo/11488-backport #12

Job	Run time
Validate Code / lint	2m 4s
Validate Code / i18n	3m 31s
Validate Code / unit-test	2m 43s
Build and Upload / Build & Upload Hosted	3m 12s
Build and Upload / Build & Upload Embedded	3m 13s
	14m 43s

Provide feedback