Closes #3497831
Merge request pipeline #470279 failed
#470282
Merge request pipeline failed for 2d3159a0 3 weeks ago