Merge branch 'connor' into connor-api-activity