New Upstream Snapshot - basemap

There were merge conflicts while merging a new upstream version.

More details

Full run details

Historical runs