Merge branch 'es/blame-L-breakage'