Merged as 2d5a7bfed5ccae6ce8adbef3ae1017d6ce8512be.