mutex sleep queue
Merge branch 'gs'
Merge branch 'master' into wj_dev