Merge "Fix NPE with null cursor" into klp-dev