Closes #3490394
Merge request pipeline #352969 passed with warnings
Merge request pipeline passed with warnings for 07433b2b 9 months ago