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