Merge branch 'jk/test-shell-trace'