Refs #14008 EEA; refactoring; details in REFACTOR.txt