Merge "changes for CSIT integration"