Merge branch 'hotfix/hotfix2.3.1'
Merge branch 'release/beta2.4'
Fix calculation of sphere of influence.
Merge branch 'hotfix/hotfix2.4.1' into develop