bug fix , v1.1 for production in master
Merge branch 'master' into r2_index
complet v2