[releases/2.1] Cherry-pick: [High Priority] Add resolve service with … #562

All 698 tests pass in 54m 32s

40 files ± 0 40 suites ±0 54m 32s ⏱️ - 1m 55s
698 tests + 3 698 ✅ + 3 0 💤 ±0 0 ❌ ±0
16 980 runs +90 15 910 ✅ +90 1 070 💤 ±0 0 ❌ ±0

Results for commit 4acfa3c. ± Comparison against earlier commit 7f2b367.