Prd 4898 into 5.0.5