Merge branch 'feature/32' into 'master'

Drop v32

See merge request !7
2 jobs for master in 5 minutes and 28 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed 33 #104408
docker-build

00:03:28

passed 34 #104409
docker-build

00:03:11