Merge remote-tracking branch 'origin/main' into 225-add-1tc-masa-tests-for-renderer