envelope fields checking function
Merge branch 'master' into 364-envelope-check
Merge branch 'master' into 364-envelope-check
Merge branch '364-envelope-check'