Merge branch 'dev-archive_conflicts' into 'master'

Address differences in conf/archive_*.yml between 'dev_cross' and master branch

See merge request !190