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