Fixing production bugin V1.1
Merge branch 'master' into r2_index