Merge branch 'rs/wt-status-cleanup'