Merge branch 'ds/trace-log-progress-fix'