Card #226 fix for read receipts
Merge remote-tracking branch 'origin/develop' into develop