Merge "Draft single controller"