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