Capture stack trace
Merge branch 'michel_3087_stack_trace' into next