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

Port 2021 05 14

See merge request dms3/public/go-verifcid!1
2 jobs for master in 29 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #910
testing
build

00:00:13

 
  Test
passed #911
testing
test

00:00:15

93.3%