Merge remote-tracking branches 'upstream/wip-7447', 'upstream/wip-7604' and 'upstream/wip-7607' into wip-sam-testing