Bug 960378 960458 [merge]