Merge remote-tracking branch 'upstream/edge' into hack/interim-feed-hold