+ Resolve OE-2715 fix for foreign key definitions on cvi status