little modified
Merge branch 'master' into light
further the schedule of apply
Merge branch 'light'