Changes from upstream (Add more features for mini basemap)