fix encrypt_stuck
Merge branch 'bug/encrypt_stuck' into dev