Merge commit '239775a2ce01f7faf938a5edafe9941922542150' * commit '239775a2ce01f7faf938a5edafe9941922542150': LightsService cleanup:
Merge commit '239775a2ce01f7faf938a5edafe9941922542150' * commit '239775a2ce01f7faf938a5edafe9941922542150': LightsService cleanup: