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

Port 2021 04 20

See merge request dms3/public/go-datastore!1
2 jobs for master in 3 minutes and 30 seconds (queued for 27 seconds)
Status Job ID Name Coverage
  Build
passed #947
testing
build

00:02:07

 
  Test
passed #948
testing
test

00:01:23

70.4%