* Fixes NB#86564, merged from trunk several commits