* Merged fix for NB#85771 from trunk