Merge "Revert "Controller/Adapter/Cursor refactor""