* Fixes NB#86408, merged from trunk r4871