PIM-817 : fix variant group scenario