Last changes for 1.1.5