[MERGE] Fix backtrace