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

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

Provide feedback