Final changes before 2.5.3