Fixed error in uuid migration related to geocoding
Merge branch 'feature/uuid' into feature/cloud