v3.8.3
CHERRY-PICK: d3bce8d onto v3.8.1
Move Cursor to contrib. Ensure everything is exported to make this possible