Merge branch 'aws-m18-cherrypick-June16' into 'release/0.21'

Merge request reports

Loading