Merge "Make the language version selection smarter" into nyc-dev