release-19.3:Backport2771

Merged bee26 requested to merge bee26-release-19.3-patch-16207 into release-19.3

Merge request reports