Merge "Added data activity support"