Merge "Adapt to BranchNameKey refactoring"