Changes to support new SDK
Merge remote-tracking branch 'origin/V2.02'