Bug 971204 and 974493 

[test]