changing to 40.0
Merge branch 'divyam' into mayank