issue #22155: Incremental progress on PO.
issue #22155: Incremental progress on PO.