issue #22155: Incremental progress on PO. Fill out vendor orms more.