Merge "Reduce anchor lookups related to PrefixResolver (CPS-2417 #1)"