TW-31311 Build cannot run on any agent
(cherry picked from commit 95c7222)
Merge remote-tracking branch 'origin/master'