Merge branch 'dg/local-mod-error-messages'