Merge branch 'km/branch-get-push-while-detached' into maint