refs #17801, more incremental progress