BC-2481 #comment no hard-coded for setting countrycode