Merge "Fix the incorrect cursor column lookup."