Merged last changes