Multiple Mesh Gateway + M2 Downlights causing duplicated devices in HomeKit

Hi, I have around 50 M2 downlights connected to three different mesh gateways, however when connected to homekit, some lights are connected to two gateways and thus causing a duplicated light appearing on homekit, the duplicated light are even sometimes unresponsive due to distance between the light and gateway.

Will yeelight push an update to stop the duplication?