Yiliu/master/fix working group broken

Created by: flora8984461

This is a draft to make a comparison

Merge request reports