Merge branch 'kk-4.4' into rr-4.4