Merge branch 'refs/heads/t/kill_usleep'