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