Merge "Refactor code to PluginEnabler"