Merge tag 4.4.4_r1 --> 4.4.4_r2