Merge "Don't ignore reset." into nyc-andromeda-dev