Merge remote branch 'remotes/origin/fix-reset'