issue #22155: Continuing work on project for P/O.