more CR fixes
Merge branch 'core-updates' of github.com:EchoAppsTeam/js-sdk into core-updates