[FIX] Expected singleton

Merged Sebastian Kennedy requested to merge 8.0-fix_singleton into 8.0-stage

Merge request reports