Merge branch 'js/blame-parsename' into maint