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

Port 2021 07 02

See merge request !1
2 jobs for v0.0.1 in 13 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #1598
testing
build

00:00:04

 
  Test
passed #1599
testing
test

00:00:09

1.8%