Use cname
dsl instead of resolve helper
#10249
Merged
cname
dsl instead of resolve helper
#10249