Merge remote-tracking branch 'upstream/main' into contri-graph