landed patches for bugs 916997, 917188