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

Port 2021 04 18

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

00:01:00

 
  Test
passed #891
testing
test

00:00:55

91.0%