Update for 1.7.0-alpha.2