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