Merge branch 'ks/branch-list-detached-rebase-i'