Added send_location query
Deleted bad assert
Merge remote-tracking branch 'upstream/master'