Merge branch 'master' into ki_branch