Merge clide.xml clide.reactive clide.client into master.