Some refactoring was needed for this change, as well as adding more telemetry to validate the result.