Merged changes from world-map