Merge branch 'reset' into release