Issue #2392863: Remove the default values instance setting, introduce a default country instance setting