manual merge of Alexandre's last changes