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