Merge lightsOn fix from client