* Add envelopes * oops * Remove unused loc string * comments and fixes (cherry picked from commit 85e36266fa5d24dd742b050e2a64c0a68cdc66db)