Merge "Added support for the new 1.2 data setup/deactivate API"