* Merged fixes for NB#85060. NB#86079 and NB#85621 from trunk