Merge branch 'po/error-message-style' into maint