[CS-984] Merge origin/master into develop
[CS-984] Merge master branch into develop branch
[CS-909] Test 1
[CS-910] Test 2
[CS-911] Test 3
[CS-910] Test 4
[CS-911] Test 5
[] Merge origin/develop into master
[] Release version 2.6.0