Hi.

I'm sending following backport that I've just tested.

Martin