Merge branch 'ledvinap-cleanup-leds'