index Tag ID and Country ID (they are read during updates, though not during normal reads)
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'