Merge remote-tracking branches 'upstream/wip-7655' and 'upstream/wip-div' into wip-sam-testing