Applied patch from #56 to 11.x
Closes #1166282
Merge request pipeline #244411 passed
#244412
Merge request pipeline passed for 7dac11e5 9 months ago