Merge "Enable CursorWindow for Ravenwood" into main