Merge "Correctly detect the wrong Z value for the light" into lmp-dev