Merge branch 'jk/merge-file-exit-code' into maint