Split branch settings LMS-11056
Split branch settings code review fixes LMS-11056