AB - fixed bug with not providing light id
AB -merged