landed patches for bugs 917227 and 757866