Fixes Bug 895370

[merge]