[T7051] Fix controller functions

Merged Joel Maglioni requested to merge T7051 into 17.0-stage

Merge request reports