#691 - Site discriminator support