Merge pull request #779 from vnarayan13/4.3

4.3 BUG: Fix OpenCAD Generic Test errors