Final changes of 2.3.85