Merge "Fixed crash caused by a cursor not having extras." into oc-dev