Bug 890119
merged conflicts