Code

Merge branch 'jc/maint-merge-recursive-fix'