Merge "SO CSIT failing due to invalid syntax"