Selected which activity data to track and receive
Merge branch 'master' into koala