Z-Wave OTA Update Issues with Aeotec TriSensor

I’ve been trying to resolve an issue with OTA updates for my Aeotec TriSensor devices. While some devices work well with firmware version 2.16, others freeze when motion is detected. I upgraded a few to version 2.21, but they’ve become problematic. Aeotec’s support suggested some troubleshooting steps, but nothing has worked so far. I even tried using firmware version 2.17, which they provided, but I can’t update the sensors. I’m using a C-7 controller, and the sensors are within 5 feet of it. I’ve also tried excluding and re-including the sensors, but the issue persists. The update process gets stuck at the point where it waits for the sensor to request the update. I’ve waited over 60 minutes without any progress. I’ve tried both with and without S2 security enabled, and the battery is new. I’m really stuck and would appreciate any advice or suggestions. Thanks!