Merge remote-tracking branch 'origin/wjc' into Dev-Wxr

wxr

2023-04-11 87bc1140ac4a1dc3e46a322444a80a9ce321b57d

 HDL_ON/DAL/DriverLayer/Control_TcpClient.cs

@@ -295,7 +295,10 @@
                    }
                    finally
                    {
                        heartBeatThread = null;
                        if (heartBeatThread != null)
                        {
                            heartBeatThread = null;
                        }
                        HeartBeat();
                    }
                }