Merge branch 'carrot-bullying' into 'develop'

Add some hard limits on inserted activities.

See merge request !595
2 jobs for develop in 3 minutes and 16 seconds (queued for 4 minutes and 2 seconds)