Merging last evolutions from Julien