Merge kk-4.4 into kk-test