Squashed 8.0.0-beta3.