XD-1772: Force use of disambiguating label