Populate country choices in address form itself
Merge branch 'pr/202' into HEAD