merged branch plugins_become_modules