Code

Merge branch 'jc/maint-combined-diff-work-tree' into maint