Merge remote-tracking branch 'origin/main' into 566-masa-2dir-metadata-coding-at-384-encodes-wrong-data
