Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2' * commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2': Fix some metadata retriever issues:
Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2' * commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2': Fix some metadata retriever issues: