Fixing TOOLS-2549
Merge pull request #105 from sohaniwso2/developer-studio-3.7.0

Fixing TOOLS-2549