Merge Kk4.4 into AOSCP-4.4.2-r2