new publish for SDK 2
new publish for SDK 2
new publish for SDK 2
Fixed merge conflict #1153
Merge pull request #1157 from pennij/working_tues0416

Fixed Merge Conflict for PR #1153