Porting 4.4 changes to 4.5.