Related to #3502062
Merge train pipeline #405376 passed with warnings
Merge train pipeline passed with warnings for 607c4536 1 week ago