Enable bootstrapping to work on v5.10.x
Update Changes and bump to version 6.83_02