Merge remote-tracking branch 'origin/main' into 225-complete-masa-external-renderer-implementation