* Fixes NB#90942, merged from trunk r6166