new patches for bugs 935277 and 943496