Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint