This is a BC break for people extending the controller (it changes the signature), which is why a previous PR changing it has already been reverted