Merge branch 'main' into 379-extended-metadata-issues