Merge branch 'feature/collisions' into develop

2 jobs for develop in 8 minutes and 14 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed build-gcc-impi #1021299
docker

00:08:14

passed build-intel-impi #1021300
docker

00:05:27