Propagate MR !1032 from `2018-patches` to `master`

Merge request reports

Loading