Merge branch 'bw/pathspec-remove-unused-extern-decl'