Merge branch 'empty-stack-trace'