bug fix release 1
Merge remote-tracking branch 'origin/master' into r2_contacts