Backport of 1e6808b2 to 3.0.
Merge request pipeline #558934 passed
Merge request pipeline passed for 63245fd3 3 months ago
Pipeline #559173 passed
Pipeline passed for 63245fd3 on 3.0.x 3 months ago