avoid partial expression inception invovling recursive data structures
Merge pull request #1501 from evs-chris/dev

Avoid partial expression inception invovling recursive data structures