Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev