PIM-836 : Fix issue on VariantGroup mapping