Replacement for @raoulb pr#914

See #914

ToDo:
- [x] tests
- [x] final rebase
as above