Merge branch 'jk/long-error-messages' into maint