Merge "Add support for names-factory provided by a plugins" into stable-3.5