Merge "Always switch if default is OOS" into main