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

Port 2021 05 03

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

00:00:45

 
  Test
passed #1006
testing
test

00:00:28

78.9%