Merge "Process content headers when metadata is empty"