Split branch settings code review fixes LMS-11056