Here's the corresponding additional patch (not yet merged into the main patch).


        Stefan