Merge branch 'jn/wt-status'