Merge "Don't flatten nullptrs" into nyc-dev