Part of ENG-9456.
I need to reuse this code in next diff.
Tested in next diff
Shouldn't we await to keep it consistent with the previous implementation?
add await