Bug 901949

[merge]