Merged master and create-activity-tests