Merge branch 'refs/heads/fix-gps-addresses'