Fixing merge conflicts
New 'Reset' API method