Merge "Handle the uncommon case that a name is null" into nyc-dev