Merge branch 'jk/maint-cleanup-after-exec-failure'