--HR-393 handle upgrade and option group related changes
Merge pull request #684 from PoonamNalawade/Hr393

--HR-393 handle upgrade and option group related changes