Merge branch 'marcus/finishing-activity' into develop