Issue 20040: Added Shipping Charges and Hold Types