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

Port 2021 04 19

See merge request dms3/public/go-block-format!1
2 jobs for master in 1 minute and 22 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #933
testing
build

00:01:12

 
  Test
passed #934
testing
test

00:00:09

76.9%