updated version of dropping task_buffer
Merge remote-tracking branch 'origin/master'