Merge branch 'feature/move-activity' into 'develop'