Merged in changes to backtrace and instantiations from 9.4 branch.  Passes unit tests.