DO NOT MERGE clone of !55283

What does this MR do?

This MR is a clone of !55283 (merged) to see if it fixes #323329 (closed)

Merge request reports

Loading