Fixed the typo in resetClassStyle (#4971)
Merge branch 'branch-6-4'
Fix overflow in integer calculations (#4970)