Updating changes for 8.0.0-a23