[IC] repairing problems from last merge