Port all 4.4.2_r2 files and fix