Fix for dumptrace.
Merge branch 'develop' into develop-poc-5