Merge branch 'people-nearby-fake-group-613558'