RFC: PR after Rebasing onto master

Hi Felix,

as you've  requested: here's the rebased commit history of this feature as a discussion base for our phone meetup on friday.

Cheers,

tommy