Merge remote-tracking branch 'upstream/edge' into experiment/merge-delta-grid