Merge branch 'port-2021-04-19' into 'master'

Port 2021 04 19

See merge request dms3/public/go-block-format!1
2 jobs for v0.0.1 in 16 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #943
testing
build

00:00:10

 
  Test
passed #944
testing
test

00:00:06

76.9%