Initial Backport

Lighting magic deactivated for now