Fixed dtrace problems.
Merge branch 'test' into dev
merge.