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

Port 2021 07 04

See merge request !1
2 jobs for v0.0.1 in 4 minutes and 52 seconds (queued for 6 seconds)
latest
Status Job ID Name Coverage
  Build
passed #2167
testing
build

00:00:16

 
  Test
passed #2168
testing
test

00:04:35

90.4%