Pick correct recipient and encoding
Merge remote-tracking branch 'chiiph/bug/pick_correct_recipient_and_encodign' into develop