Merge "Added CSIT for Macroflow with HEAT"