updates for bug 879799, 884887. include patches for bugs 878186 and 883649 which i missed to include in yesterday's commit