Merge branch 'jc/maint-config-exit-status'