Merge branch 'cb/maint-exec-error-report'