Prd-4760 (5.0 backport)