Added more tracing.
Merge branch 'develop'