Porting r53478 into mainline: