Merge branch 'telegps-v3'