Merge remote-tracking branch 'origin/feature/10465_sfCalculator_new_geometry' into bugfix/10609_sfcalculator
Merge branch 'bugfix/10609_sfcalculator' into develop