Merge "Improved addMissingMetadata() on POST failure"