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

Port 2021 07 02

See merge request !1
2 jobs for master in 34 seconds (queued for 12 seconds)
latest
Status Job ID Name Coverage
  Build
passed #1668
testing
build

00:00:15

 
  Test
passed #1669
testing
test

00:00:18

60.9%