2.4.89 final changes