Merge "Make clatd enforcing."