Merge branch 'develop' into 'main'

Release 20-06-22

See merge request !492
7 jobs for main in 6 minutes and 19 seconds (queued for 4 seconds)