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

Port 2021 05 03

See merge request dms3/public/go-dms3-files!1
2 jobs for master in 50 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Build
passed #1003
testing
build

00:00:32

 
  Test
passed #1004
testing
test

00:00:18

78.9%