UPGRADE: paks
FIX: est when handshaking fails
Merge branch 'master' into dev