Bring in CDN changes from 4.0 branch.