Merge Leaflet to development