small changes for light
Merge branch 'refs/heads/jan'