Merge "Minimal changes to bring the resolver into the C++ era"