aws387PRs merged62Internal authors@zuoyaofu@zixlin7@xiaox-chen@wularr@vchikoti1998@valerena@tincheng@spfink@smoring2@sarayev@sannicm@samgst-amazon