Merge remote-tracking branches 'origin/wip-7942' and 'origin/wip-8124' into wip-sam-testing-safe