Fixed TOOLS-2540.
Merge pull request #100 from kaviththiranga/developer-studio-3.7.0

Fixed TOOLS-2540.