Add CloudFront support
Merge