Fix tracing source file handling.
Merge topic 'optimize-source-file-processing' into next

157046a0 Fix tracing source file handling.