Updated comments
Merge remote-tracking branch 'geofence/dev' into dev