Merge "Fix null fields"