Closes #2925427
Merge request pipeline #319068 passed with warnings
Merge request pipeline passed with warnings for da56684d 3 months ago