Merge remote-tracking branches 'origin/wip-7891', 'upstream/next' and 'somnathr/wip-sd-cpu-optimized' into wip-sam-testing