ISPN-1627 Removed OverrideDefault