Manually cherry pick !43555 to master

Manual cherry pick of !43555 (merged) from 21.3 to master

Merge request reports

Loading