Closes #3458714 by reapplying a fix from #3400762
Merge request pipeline #214567 passed
#214571
Merge request pipeline passed for c7c4b096 11 months ago
closed