Fixes 4.6

manual cherry-picks out of !1640 (merged)

Merge request reports

Loading