updates for bugs 859170 and 859858