Fixed the threshold edition
reverted a test modif
added a few comments and explanations
Merge branch 'master' into web
Merge branch 'master' into web
Merge branch 'master' into web
Merge branch 'master' into web