Cherry pick MR 466

Morris Esteparequested to merge
aws-cherry-pick-release/0.19 into release/0.19

Original MR: !466 (merged)

Edited by Morris Estepa

Merge request reports