merge missing geofence support