Update for 1.8.0-beta.4