Merge branch 'jn/wt-status' into maint