Update in according to Platform API chnages
Merge branch 'master' into IDEX-1125
IDEX-1126