Merge branch 'es/outside-repo-errmsg-hints' into maint