Merge branch 'rr/needs-clean-work-tree'