Merge remote-tracking branch 'origin/main' into ci/restore-tests-for-masa-prerenderer-lower-sr