1026_branchShortName
Merge branch 'feature/1026_branchShortName' into develop