Merge nextgis changes