Merge branch 'rr/stripworkdir'