Merge remote-tracking branches 'origin/wip-sam-testing2', 'origin/wip-7942', 'origin/wip-8020', 'upstream/wip-8046' and 'upstream/wip-7891' into wip-sam-testing