Manually merged fix to country select 5c01e8543c01b99c0f73bd374c82f97d8d50a9e0