Merge "On null changes serialize the id as null"