add CNAME
move CNAME
Merge branch 'master' into structural-tryout