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

Port 2021 05 02

See merge request dms3/public/go-dms3-chunker!1
2 jobs for master in 5 minutes and 24 seconds (queued for 1 minute and 36 seconds)
Status Job ID Name Coverage
  Build
passed #1015
testing
build

00:01:47

 
  Test
passed #1016
testing
test

00:03:36

81.2%