Merge "Modify to use new BacktraceMap creation function."