refs #31001, #30996