Merge remote-tracking branches 'origin/wip-7891', 'upstream/next' and 'guangyy/wip-pg-splitting' into wip-sam-testing2