Bug fix v 1.1 for production
Merge branch 'master' into r2_index
merged from r2_index
merged2 from r2_index