Add logic to reset/reload methods (see #7918)