[3.0] Update with the moving of mutex, conditional wait under a threading folder