release-19.2:Backport!2387

Merged bee26 requested to merge bee26-release-19.2-patch-01761 into release-19.2

Merge request reports