cherry-picking the recent hotfixes to aptos-main #943

Closed vgao1996 closed 1 year ago