Merge (regenerate after) 2b78ec58.