BC-2481 #comment checked for calling setCountryCode