Merge "Daeal with null cursors more leniently." into nyc-dev