bug fix

v1.1 bug fix for production
Merge remote-tracking branch 'origin/master' into r2_contacts