Merge remote-tracking branches 'origin/wip-sam-testing2', 'origin/wip-8124', 'upstream/wip-7891', 'origin/wip-7588', 'origin/wip-8011' and 'origin/wip-8086' into wip-sam-testing