Fixed issue. This refs #10465
Merge branch 'feature/10465_sfCalculator_new_geometry' into develop