Integrated Tim's changes
Merge ../rcl-tim into feature/create_proximity_searches