Merge "Extra logging for metadata errors"