Merge "Fix compilation issue and add coredomain support"