Changes required for handshake pattern #757

Job	Run time
test-win (windows-2022, shared_build)	2m 3s
test-win (windows-2022, static_build)	2m 31s
test-unix (ubuntu-24.04, shared_build)	48s
test-unix (ubuntu-22.04, shared_build)	47s
test-unix (ubuntu-22.04, static_build)	58s
test-unix (macos-14, shared_build)	55s
test-unix (ubuntu-24.04, static_build)	44s
test-unix (macos-15, shared_build)	1m 4s
test-unix (macos-14, static_build)	1m 2s
test-win (windows-2025, static_build)	2m 19s
test-unix (macos-15, static_build)	1m 21s
test-win (windows-2025, shared_build)	2m 46s
	17m 18s

Provide feedback