prepare to recode client adapter
fix client adapter
Merge branch 'master' into lopv2