patches for bugs 869565 and 869981