Merge branch 'develop' into 'main'

Release 08-08-22

See merge request !494
7 jobs for main in 3 minutes and 35 seconds (queued for 2 seconds)