Merge remote-tracking branches 'upstream/wip-7632' and 'upstream/wip-7393' into wip-sam-testing