V 1.10 - Removed hard coding for geometry service

Resolved Ticket - #336
Merge remote-tracking branch 'CT/SG-V-1.10'