* Fixes NB#86471, merged from trunk r5015