Merge "Defer future actions until reset it complete." into main