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

Port 2021 05 03

See merge request dms3/public/go-dms3-delay!1
2 jobs for master in 37 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Build
passed #937
testing
build

00:00:05

 
  Test
passed #938
testing
test

00:00:32

89.3%