Thank you both!

Here is a reworked version, this OK for trunk?