Refs #14008; updates on refactoring