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

Port 2021 04 19

See merge request dms3/public/go-dms3ld-format!1
2 jobs for master in 1 minute and 41 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Build
passed #965
testing
build

00:01:22

 
  Test
passed #966
testing
test

00:00:19

27.0%