OP-1064 - converting legacy rest controllers