Merge branch 'feature-dtrace'