[CS-982] Merge origin/develop into master
[CS-982] "Release version 2.3.0"
[CS-982] Merge origin/master into develop
[CS-982] Merge master branch into develop branch