Merge last changes from head, to keep them aligned