Merge from last changes