LRSIX-4205 - added more amendments to branching code