Virmani/gradle

Restored