finish machine provider
Merge branch 'light'