Add geo info to voice
Merge branch 'geo'