Merge "Refactored metadataretriever_fuzzer" into main