> This is bug#18136 hitting again.  I'm on it but it may take some time.

Can you try the attached patch?

Thanks, martin