Merging AWS code into master