Merge "Convert csit to be Packer compliant"