Merge "Migrating additional failing reset-related tests" into sc-dev