refs #12202 performance tweaks