[CS-984] Merge origin/develop into master
[CS-984] "Release version 2.5.0"
[CS-984] Merge origin/master into develop
[CS-984] Merge master branch into develop branch