Finish up the 4.4 r1.1 merge