[FIX] Expected singleton

Merged Santiago Said requested to merge Fix into 11.0-stage

Merge request reports