Fix issue with conditional fields

Assert Error fix and Conditional fields dependecy.

Merge request reports

Loading