Fixes: #16988 (closed)
(Cherry-pick from !81213)
Merge request pipeline #307842 skipped
Merge request pipeline skipped for 0d041fb9