Merge remote-tracking branch 'slim/kk4.4' into kk4.4