Added latest 8.2 changes