Merge branch 'port-2021-04-20' into 'master'

Port 2021 04 20

See merge request dms3/public/go-datastore!1
2 jobs for v0.0.1 in 1 minute and 23 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #949
testing
build

00:00:29

 
  Test
passed #950
testing
test

00:00:53

70.4%