yes, this needs to be rebased. I'm not sure what is the current state of @mluessi 's PR. The idea earlier was to merge that into master and then rebase from master. Is that still the plan?