* Fixes NB#85378 merged the fix from trunk