PIM-817 : fix variant group scenario
Merge branch 'master' into update_bap_beta