Cherry-pick changes from main
#426
Merged
background
wait
wait-all
cancel
Loading