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

Port 2021 05 02

See merge request dms3/public/go-dms3-blocksutil!1
2 jobs for master in 1 minute and 11 seconds (queued for 11 seconds)
Status Job ID Name Coverage
  Build
passed #953
testing
build

00:01:02

 
  Test
passed #954
testing
test

00:00:08

100.0%