Merge "Changed the object mapper to ignore unknown fields"