Merge branch 'sb/wt-status-cleanup' into maint