Merge remote-tracking branches 'upstream/wip-8011', 'upstream/wip-8283' and 'upstream/wip-7576' into wip-sam-testing