Changes for 8.2.0.Final