Refs #8502 rest of refactor tasks