Merge branch 'el/blame-date'