issue #22155: Changes related to P/O.