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

Job	Run time
Validate Code / unit-test	2m 46s
Validate Code / lint	1m 54s
Validate Code / i18n	3m 26s
Build and Upload / Build & Upload Embedded	3m 6s
Build and Upload / Build & Upload Hosted	3m 8s
	14m 20s

Provide feedback