Merge "Add Support for Activation and Deactivation"