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

Port 2021 05 24

See merge request dms3/public/go-detect-race!1
2 jobs for master in 1 minute (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #929
testing
build

00:00:08

 
  Test
passed #930
testing
test

00:00:52

100.0%