Merge "corrections for packaging and CSIT"