Merge "Add CSIT rls1908_2 branch"