Closes #3496029
Merge request pipeline #378847 passed with warnings
Merge request pipeline passed with warnings for f5a9cf4c 4 months ago