Fix py3.6 crash by re-implementing #1289 #501

Job	Run time
static_flow test on ubuntu-22.04	12m 12s
static_flow test on ubuntu-24.04	10m 24s
no_mirror test on ubuntu-22.04	10m 58s
no_mirror test on ubuntu-24.04	12m 33s
flakey_broker test on ubuntu-22.04	40m 57s
flakey_broker test on ubuntu-24.04	40m 57s
dynamic_flow test on ubuntu-22.04	27m 13s
dynamic_flow test on ubuntu-24.04	13m 51s
restart_server test on ubuntu-22.04	11m 19s
restart_server test on ubuntu-24.04	12m 47s
	3h 13m 11s

Provide feedback