[PATCH] Merge stacktrace and show_trace