Shipping files is now working though shipping data to client needs to be init by client.
Resolved merge conflicts.