Cherry-pick latest awsbox
Adding comments and renaming variable per francois