4.5.x

merging up 4_4_x into 4_5_x