issue #22155: More db work on PO.