Merge kk4.4 into AOSCP