Bugfix: use keys of additional values for expression parsing
Merge branch 'master' into 1.0