Merge "Introduced ForwardingResolver"