Merge branch 'ks/branch-cleanup'