Merge "flow for the deactivate"