Issue #21953:tweaks to Blanket PO