Feature/cname urls

Merge the CNAME Urls feature into release/candidate