Merge "Don't update checksum if data ptr is null." into nyc-dev