Updated SDK to commit 96789466d8540be0f5129a00374e477e6fb3c1c7
Merge remote-tracking branch 'upstream/develop'