Hi,

This rebased patch applies cleanly after commit f172118ca43. Thanks!

Kind regards
Felix Lechner