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

Port 2021 05 02

See merge request dms3/public/go-ds-badger!1
2 jobs for v0.0.1 in 2 minutes and 21 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #2175
testing
build

00:00:49

 
  Test
passed #2176
testing
test

00:01:32

61.3%