Merge branch 'bugfix/p2p_cylinder_collisions' into develop

2 jobs for develop in 8 minutes and 3 seconds (queued for 1 second)