Release Version 1.7

Shipments fix (Should work)