add basic clients section
merge with upstream