Apply fixes to 6.2.x