Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint