* Fixes NB#87094 merged from trunk 5191 & 5259