* Ported fix for NB#85924 from trunk