Added tracing.
Merge branch 'master' into develop