Code

Merge branch 'jc/maint-combine-diff-pre-context' into maint