Merge "Fix CSIT for CLAMP as UI was reworked"