Merge branch 'master' into geometry-collection-caching