Reset merge
Merged from remote
Updated to latest js-sdk