Merge pull request #145 from maksimov/develop

Reverting VM capabilities change