* Merged fixes for bugs 86171, 86476