Split branch settings LMS-11056
Code review cleanup and fixes

LMS-11056