Merge "resolve lcm csit issue"