issue #22155: Incremental progress fixes.