* Fixes NB#87113. Merged from trunk r5165