Merge branch 'dk/blame-el' into pu