Merge "Add missing reset() calls"