issue #22155: More progress on vendor address. Actually starting to work on PO now.