Fix USC coordinates
Fix USC location enrichment test
Merge branch 'release-v5.2'