PIM-870 : Fix variant groups scenarios