HCOLL-167 refactored - doHandShaking()