Null merge 3.5: datetime was already fixed, but with a very different implementation