Merge "Merge history of Nearby" into tm-dev