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

Port 2021 05 02

See merge request dms3/public/go-cidutil!1
2 jobs for master in 46 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #896
testing
build

00:00:20

 
  Test
passed #897
testing
test

00:00:26

73.1%