Merge "Obtain stack trace outside of critical section" into nyc-dev