Merge "Use Cursors directly when binding documents." into klp-dev