* Fixes NB#88986. Merged from trunk r6068 + one fix from r6161