Porting 4.4 fixes to 4.5.