* Fixes NB#87102, merged from trunk r6038