* Merged fixes for bugs 86562, 86266