Merged into bug ae998b27-a11b-4243-abf6-11841e5b8242