Merge branch 'sb/plug-wt-shortstatus-tracking-leak'