Fix a CDN-related bug.
Merge remote-tracking branch 'origin/next'