Merge branch 'rs/wt-status-detached-branch-fix' into maint