Add finishing activity
Cleanup finishing activity
Merge branch 'marcus/finishing-activity' into develop