Merge remote-tracking branch 'origin/main' into 464-add-be-comparison-tests-to-external-renderer-for-masa