Merge branch 'rs/progress-overall-throughput-at-the-end' into maint