enabling CNAME again
Merged master