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

Job	Run time
Validate Code / i18n	3m 32s
Validate Code / lint	1m 53s
Validate Code / unit-test	2m 41s
Build and Upload / Build & Upload Embedded	3m 9s
Build and Upload / Build & Upload Hosted	3m 6s
	14m 21s

Provide feedback