PG Merged Sales Order changes - Bundle 21