Merge branch 'backport-trace-ninja-dashc' into trace-ninja-dashc