Merge with master and commit geofence framework