update to the CDN code.
Merge branch 'release/v2.0.0' into develop