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