Cherry Picked EPR - 379907 from the develop branch