Necessary changes for CSIT stable/1606 branch