Changes to adapt to new universal SDK#2

Open

Adrian-IM wants to merge 2 commits intocloudblue:masterfrom

Adrian-IM:master

Commits on Nov 25, 2019

Universal SDK changes
Adrian-IM
committed

Commits on Jan 16, 2020

Update to latest Universal SDK changes
Adrian-IM
committed