DEV R4 backport.