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

Port 2021 05 03

See merge request dms3/public/go-dms3-exchange-interface!1
2 jobs for master in 5 minutes and 10 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  Build
passed #983
testing
build

00:04:47

 
  Test
passed #984
testing
test

00:00:23