Merge branch 'js/blame-lib'