GCL1-12535 and Shipper fix