Merge "Fix CSIT linting"