* Fixes NB#86719, merged from r4869 in trunk