[Data] Integrated the latest updates from ORI (RFD and Geonames).
Merge remote-tracking branch 'origin/trunk' into releases