Before combining derived and conditioanl-derived variables
LEMS NML2 Example 5 working
LEMS NML2 Example 5 working
Merge branch 'master' into development