* Generate and condition, need to handle the NoError token
Merge branch 'develop' of https://github.com/osate/ErrorModelV2.git into develop