Closes #3515941
Merge request pipeline #459458 passed with warnings
Merge request pipeline passed with warnings for 0bec8363 4 months ago