schema change for aws
geo controller change for aws
Merge branch 'aws_test'