* Fixes NB#85528, merged from trunk