Manual merge from origin/Dico

Manual merge