Post 4.4.3_r1.1 merge cleanup