Merge "Treat missing Cursor as FNFE." into jb-dev