Merge "Controller/Adapter/Cursor refactor"