release-20.4:Backport!5648

Merged Andrey Vertiprahov requested to merge backport-5648 into release-20.4

Merge request reports