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

Port 2021 07 04

See merge request !1
2 jobs for master in 10 minutes and 7 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #2151
testing
build

00:00:20

 
  Test
passed #2152
testing
test

00:09:47

90.4%