Continued work on #3018. Fixed stack trace copy over for additional optimizations, fixed errors in previous commit and inclduded addditional tests.