cs fix in tests
update doc
Merge branch 'master' into beta