fixxed undefined decryption
Merge branch 'origin/dev'
Merged 'dev'.
Finish without e2e-test