Just adding this merge request to simplify looking at diffs and have a place for discussion.
@pfrank, @parras, @reimar, @kjako