Merge branch '61-activity-logic' into 'master'

61 activity logic

See merge request !3
2 jobs for master in 1 minute and 19 seconds (queued for 1 second)
latest