Updated according to 8.0.x branch.