Merge when Bug 874837 is closed