Automatic merge from submit-queue Fix the way addon-manager handles non-namespaced objects Fixes #28451 cc @wojtek-t