Implement fallback handler for */resolve requests

Implement fallback handler for */resolve requests #6695