test set up
Merge branch 'cdn-test'