release weekend!
Merge remote-tracking branch 'upstream/kk' into kk