Merge remote-tracking branch 'vanir/kk44' into kk-mr2