CONN-400: Fix for not supporting country code.