Changes done for upgrading to API-V2
Merge remote-tracking branch 'origin/master'