refs #16898, refs #16726