The integration was rather painless and not much existing code was touched. Any comments @luenensc and @palmb? If not I would merge in couple of days from now...