Aws frozen fix

Merged Yunhua Koglin requested to merge aws-frozen-fix into master

Merge request reports