Merge branch 'develop' into '2021_NewPaper'

Develop

See merge request !99
2 jobs for 2021_NewPaper in 14 seconds (queued for 1 second)