Merge "no-op: Use helper class to handle pending requests" into main