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