more work on refs #6927, refs #6800