Refactoring for openagency 2.6 (branchName)
Merge branch 'develop' into feature/762_sbkopi