Merge with changes from AWS