Envelope not deserializing unnecessarily anymore
Merge remote-tracking branch 'origin/master'