Closes #3401120
Merge train pipeline #374469 failed
Merge train pipeline failed for 27dd3902 4 months ago