Merge "Revert "Revert "Expose sendEnvelope."""