Merge branch 'port-2021-05-02' into 'master'

Port 2021 05 02

See merge request dms3/public/bbloom!1
2 jobs for master in 49 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #904
testing
build

00:00:13

 
  Test
passed #905
testing
test

00:00:35

88.1%