Change to one API call

[#53026251]
[Delivers #53026251 #53026677 #53026639]

* one-api-call-53026251:
  Change to one API call