Fix conflicts merge 4.4.1_r1