Preparing for merge
Merge
Fixed light automation