pull request #2755: request for review

[Sönke Liebau]

The pull request has been open for a while now, can someone please have a
look at whether this is still viable and something we want to do?

I've updated and resolved conflicts yesterday.