Merged into bug 09f84059-fc8e-4954-b24d-a2b33ef21bf4