final changes before 2.3.0