Merge branch 'ea/blame-progress'