949_branchShortName
refactoring branchShortName
merge conflicts