merge from francopapa avare branch eu