make appli optional, as it is in the docs
merge optional_appli, fix conflicts