Merge branch 'main' into 390-masa-metadata-copying-in-external-renderer-is-out-of-sync