Merge "Add handshake callback support" into klp-modular-dev