Merge branch 'jc/check-attr-honor-working-tree'