* Fixes NB#87093 & NB#87208. Merged from trunk r5111