Last changes for 2.1.79