Change CDN url to local one for some resources
Merge branch 'patch-1'