Merge branch 'kk' into kk