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

Port 2021 05 02

See merge request dms3/public/go-dms3-cmds!1
2 jobs for v0.0.1 in 26 seconds (queued for 46 seconds)
Status Job ID Name Coverage
  Build
passed #1021
testing
build

00:00:13

 
  Test
passed #1022
testing
test

00:00:13

61.7%