Merge "Add gating to the plugin"