* Fixes NB#87102, merged patch from trunk r5213 and r5214