Merged with [82fc5abb60].