Merge remote-tracking branches 'origin/wip-8396', 'origin/wip-8625' and 'guangyy/wip-pg-splitting' into wip-sam-testing2

Conflicts:
	src/os/CollectionIndex.h