Bug in SphericalPositionCalculator fixed.
Merge origin/MainBranch into MainBranch