Merge "Fix NPE with null cursor"
tree: a32aa88e245a4ca9752bd3ae21c00a5b245ba7f8
  1. src/
  2. TestCommon/
  3. tests/