Merge "Adapt A1 controller to new interface"