Merge branch 'develop_archive' into 'master'

Develop archive

See merge request !154
3 jobs for master
in 18 minutes and 40 seconds, using 0 compute credits, and was queued for 2 seconds