#1126 - Add a Site discriminator to PageField
#1126 - Add missing catalog discriminators
#1126 - Don't ignore site automatically in identity execution utils