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

Port 2021 05 03

See merge request dms3/public/go-dms3-delay!1
2 jobs for v0.0.1 in 25 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #941
testing
build

00:00:12

 
  Test
passed #942
testing
test

00:00:12

89.3%