Refactor code in the web/
folder to use async
/await
#9995
Merged
web/
folder to use async
/await
#9995