Merge branch '2021_NewPaper' into 'develop'

2021 new paper

See merge request !98
2 jobs for develop in 16 seconds (queued for 1 second)