* Fixes NB#85740, merged from trunk r4561 & r5983 + some extra changes