LEDs: Merge in from mainline KT