Add envelope id to unique args

I've had to do a trick to split the commit from the master branch to PR (my mistake), so the check the diff please refer to the commit itself:
9398b27