Merge "Remove plugin for Controls in Global Action"