Refs #9327 EEA; further work on archiving