Merge branch 'mg/work-tree-tests' into maint