Replacement for @raoulb pr#914

See #914

ToDo:
- [x] tests
- [x] final rebase
Should we explicitely state which values are evaluated or just say 'some values'?
I think we can expand the list of these values even further.