fix the production bug ticket 110
Merge branch 'master' into r2_index
resolve