cherry-pick !6234

CCBUG: 479694 (cherry picked from commit 370c9c89)

Merge request reports

Loading