Merge "Handle nodesets in branches"