Merge "Added data activity support" into tm-dev