Fixing geofence issues
Merge