[FIX] controller_id now correctly set

Merged Santiago Said requested to merge fixControllerId into 12.0-stage

Merge request reports