cherry picked the current .net40 development