Merge branch 'trace-cmd' into trace-view