Merge pull request #703 from github/lcartey/language-extensions-impro…

Merge pull request #703 from github/lcartey/language-extensions-impro… #2947