Fix latest SDK breaking changes #842

Closed lazarmitic closed 11 months ago