Today
merge from ambient_lighting_fixes