Finished async shipping of csv data from cross origin to client.
Resolved merge conflicts.