Merge branch 'kill_tasklet_hi_enable'