Refs #9327 EEA; improve implementation of archival