Merge "Enhance debug log output for stacktraces"