Merge pull request #12962 from torchiaf/12939-fix-node-selector #908

Job	Run time
Build Test / i18n	41s
Build Test / unit-test	2m 22s
Build Test / lint	1m 31s
Build and Upload / Build & Upload Hosted	2m 2s
Build and Upload / Build & Upload Embedded	1m 57s
	8m 33s

Provide feedback