release-20.3:Backport!4380

Closed MaksimSmile13 requested to merge cherry-pick-0154978c into master

Merge request reports