Merge branch 'develop' into 'main'

Release 22-07-2021

See merge request !442
6 jobs for main in 8 minutes and 23 seconds (queued for 3 seconds)