Update for 8.2.0.0