Merge branch 'archive' into 'master'

Improve archive

See merge request bitsoffreedom/bba2017!7
2 jobs for master in 2 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test
passed #3358
deploy-production

00:00:02

passed #3191
deploy-production

00:00:01