Fixed DomainUtil
Merged changes