merge branch 'nitlight'