Finish handshake-rework
tests spec3
Finish handshake-rework
Merged 'dev'.