issue #22155: Changes related to P/O.
Merge branch 'master' into 22155
Merge pull request #80 from jrogelstad/22155

issue #22155: Changes related to P/O.