* Fixes NB#86800, NB#86757, merged from trunk r5098