bug fix, v1.1 for production
Merge branch 'master' into r2_index
changes