work on fixing intermittent failures for bugs 917227 and 757866