Merge "Get rid of any unnecessary reset calls" into main