Merge "Factory Reset flag & minor refinement over flag reset scopes"