aws7PRs merged6Internal authors@vikeshpandey@rizwangilani@edwardjkim@djarpin@balajitummala@aws-patlin