Draft: Cherry pick 693

(cherry picked from commit 8a02ef01)

Merge request reports

Loading