Merge "Guard against uncountable tag values"